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