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