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