Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into...

Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-qpr1-dev am: 96a5a3b9

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



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