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