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