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