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