Merge changes from topic "presubmit-am-467044d56f244cb485cb4cd61eb97b47" into sc-dev-plus-aosp am: c6a20512

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

Change-Id: I7054e1448cb7feb3a928ca1a11aced982302f125