Merge changes from topic "presubmit-am-b3d24d2d5c464078a26daa35c449ad8e" into...

Merge changes from topic "presubmit-am-b3d24d2d5c464078a26daa35c449ad8e" into sc-qpr1-dev am: 3c59b90c am: 6ed07968 am: e51c8719 am: bc123e44 am: c2b563e1

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



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