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