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