Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2213744 Change-Id: Ic9c3c80c453bef5b018b1c805fa58b417184ea79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>