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

Merge changes from topic "presubmit-am-b521fdc3415843d792ac3226b71ecb4a" into sc-qpr1-dev am: 985f6240

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



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