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