Merge changes from topic "am-1da92e41bda443aeaea2b6534a421baf" into...

Merge changes from topic "am-1da92e41bda443aeaea2b6534a421baf" into tm-qpr-dev-plus-aosp am: dbe22806

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



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