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