Merge changes from topic...

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

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



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