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