Merge changes from topic "presubmit-am-b3d24d2d5c464078a26daa35c449ad8e" into sc-qpr1-dev am: 3c59b90c

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



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