Merge changes from topic "cherrypicker-L59300000959974918:N81500001358561309"...

Merge changes from topic "cherrypicker-L59300000959974918:N81500001358561309" into tm-qpr-dev-plus-aosp am: 5135bdaf

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



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