Merge changes from topic "presubmit-am-cd23d9b2a39243fd926bc7a009462de9" into sc-v2-dev-plus-aosp am: 0e7b89f7 am: 3bd83b47

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

Change-Id: Id33659c77757e504ba4004c08f18dbcaa590fab1