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



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