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