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