Merge changes from topic "am-a2ca728fc00e433591b8b2fe31d914d7" into...

Merge changes from topic "am-a2ca728fc00e433591b8b2fe31d914d7" into tm-qpr-dev-plus-aosp am: 1bc9579c

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



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