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