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