Merge changes from topic "am-7f7b4a07d2d64926b0d28bce784d30d8" into tm-qpr-dev-plus-aosp am: 5acde318 -s ours

am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51370d2f is already in history

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



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