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