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



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