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