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

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

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



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