Merge changes from topic "presubmit-am-b75ac5c75f5842c08ff6a23c2ea06272" into sc-v2-dev-plus-aosp am: 10ccd781 am: e1a36e18

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

Change-Id: I5c28226604c700633687edbce0d40f15115c99ff