Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into...

Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419

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



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