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