Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-05344ff48efd40fb998cae56f5a842b0-sc-dev" into sc-qpr1-dev am: 06bbfe7d am: b3d81964 am: b6b9ce4b am: 6ac29add" into tm-d1-dev-plus-aosp am: 3a0601f5 am: 80c2256d

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



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