Merge changes from topic "presubmit-am-6a93689b571245d6a755ab0c77afd7db" into sc-v2-dev-plus-aosp am: cd43aca2 am: 464df923

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

Change-Id: I09e5282498d9e86adb8475481fde8314c523ae6e