Merge changes from topic...

Merge changes from topic "presubmit-am-05344ff48efd40fb998cae56f5a842b0-sc-dev" into sc-mainline-prod am: 3c14419c am: 9552fc8e am: 7dcfb4d4

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



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