Merge changes from topic "presubmit-am-cd23d9b2a39243fd926bc7a009462de9" into sc-v2-dev-plus-aosp am: 3649f735 am: f0f7626b

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

Change-Id: I8067bb9c49810600c6f4357cf74fd581d375c597