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