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