Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into...

Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-qpr1-dev am: a30bf19d

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



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