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