Merge changes from topic "am-9077272085e84c259e30c7aac7f599d6" into tm-qpr-dev-plus-aosp am: 66c47171 -s ours

am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf is already in history

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



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