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