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