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



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