Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp am: 3079759c9a

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

Change-Id: If72d02b757e7993015b89beb5688c0daba3cd9ea