Merge changes from topic "presubmit-am-711e8625e1514f8785791e865e5a4d7d" into...

Merge changes from topic "presubmit-am-711e8625e1514f8785791e865e5a4d7d" into sc-qpr1-dev am: 90986f86 am: 8b14f74f am: a03633e0

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



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