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