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