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



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