Merge changes from topic "presubmit-am-4f2f6883d74b4b26ac21b30841644c64" into...

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

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

Change-Id: Ie8a57ed47ebc92242b641ca3ab0a7d191bab75a6