Merge changes from topic "presubmit-am-58d727f812d04fc3b6d1823862f6bf2f" into sc-mainline-prod am: 1640f163

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

Change-Id: If95fd2ceef49e55c4df81b3d3ccc9bfca0754f39