Merge changes from topic...

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

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



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