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