Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-05344ff48efd40fb998cae56f5a842b0-sc-dev" into tm-dev am: d62abb48 am: 2d34dd58" into tm-d1-dev-plus-aosp am: fc560fd2

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



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