Merge changes from topic "presubmit-am-4190bf4705e34070ab3468a176f113b5" into...

Merge changes from topic "presubmit-am-4190bf4705e34070ab3468a176f113b5" into sc-dev-plus-aosp am: ba3e933c am: 129bbf0b am: 4eb14e34

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

Change-Id: Ic55f068784c786b6da6b110425042f9fb215d39a