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

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

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



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