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