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