Merge changes from topic "am-28e7df416a1a420ea1fcae028165ac63" into...

Merge changes from topic "am-28e7df416a1a420ea1fcae028165ac63" into tm-qpr-dev-plus-aosp am: a1d91056

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



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