Merge changes from topic "am-44884482f39c4e5bb8e97e19df49f3d8" into tm-qpr-dev-plus-aosp am: fd8116a3

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



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