Merge changes from topic "presubmit-am-4f2f6883d74b4b26ac21b30841644c64" into sc-dev-plus-aosp am: 41c63865 am: 94583038

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

Change-Id: Ia40c5b20c9cc9911ef991d9d05c0493fbd5a5f7b