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