Merge changes from topic "am-367584d2cbe9455b98f8c07e69c18f19" into...

Merge changes from topic "am-367584d2cbe9455b98f8c07e69c18f19" into tm-qpr-dev-plus-aosp am: 81d67f49

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



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