Merge changes from topic "cp-sc-dev-222473855" into sc-qpr1-dev am: a6aa8289 am: bb6a4b6f

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



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