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