Merge changes from topic "presubmit-am-02e1f9eca09a4c4c9ff2ae6cc54927d9" into...

Merge changes from topic "presubmit-am-02e1f9eca09a4c4c9ff2ae6cc54927d9" into sc-qpr1-dev am: 78685517

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



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