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