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