Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into...

Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-qpr1-dev am: 74939083

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



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