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