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