Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19395813



Change-Id: I2a49823b6bd6f1ad23c3b1e79d6570ccd535a6ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>