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