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