Merge changes from topic "am-e197cccc8ab8429e9987f2fab3840cf5" into...

Merge changes from topic "am-e197cccc8ab8429e9987f2fab3840cf5" into tm-qpr-dev-plus-aosp am: 7b32c45f

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



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