Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into sc-dev-plus-aosp am: e57ee53f am: 90aee4fa

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

Change-Id: I3f8e6f918b7c839afa5819029396200943bc4c92