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