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

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

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



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