Merge changes from topic "am-03c5c721ce7d42899ef0144b4de87edb" into...

Merge changes from topic "am-03c5c721ce7d42899ef0144b4de87edb" into tm-qpr-dev-plus-aosp am: e97eda3a

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



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