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