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

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

Change-Id: Iff32e9e55820d7d8881cb84726560fa7444b99e6