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