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