Merge changes from topic "b/232475788-frameworks/base" into tm-qpr-dev am:...

Merge changes from topic "b/232475788-frameworks/base" into tm-qpr-dev am: 31720197 am: b446de75

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



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