Merge changes from topics "b231496105",...

Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am: 44893b71

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



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