Merge changes from topic "am-2bf538dca34746eb9710be3e2ab1743e" into tm-qpr-dev-plus-aosp am: 81475097

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



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