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