Merge changes from topic "presubmit-am-3741432fa32f48a290800d57fe4e6e74" into sc-v2-dev-plus-aosp am: 7abf467d0a

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

Change-Id: I5d2665eefe8ed3cf52d1287756646c499ab7b9b3