Merge changes from topic "cp-sc-dev-222473855" into sc-mainline-prod am:...

Merge changes from topic "cp-sc-dev-222473855" into sc-mainline-prod am: a42bd431 am: ff2773b0 am: 0fe59ac7 am: ef1f758f

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



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