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