Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into...

Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-qpr1-dev am: d7133ae5 am: a0b9c690

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



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