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