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