Merge changes from topic "presubmit-am-f515d2b631e34822b9a0633456f2c165" into sc-v2-dev-plus-aosp am: 849c6e4192

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

Change-Id: I816d8b87d6529afc6ec3f975fee70470012d6ed4