Merge changes from topic "cherrypicker-L93200030008016034:N30400030132979062"...

Merge changes from topic "cherrypicker-L93200030008016034:N30400030132979062" into sc-qpr1-dev am: 234d171f

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



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