Merge changes from topic "presubmit-am-54e4845950504a539a3613428007324a" into sc-v2-dev-plus-aosp am: 2101d2fc am: 0607ae4f

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

Change-Id: I8b5ab5fc6cbdac3ba5a99a033d5e2f73308514af