Merge changes from topic "presubmit-am-e165dd214d2e4d94b566a580484fe2b0" into sc-v2-dev-plus-aosp am: 8c5c492c am: 3262e742

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

Change-Id: I9497d0d596a2eb0caae95188682a72907fc3ecf2