Merge changes from topic "am-066e08a4a39f4bf0b40079cc3a5b641c" into tm-qpr-dev-plus-aosp am: 5611744a

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



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