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