Merge changes from topic "presubmit-am-ff080f640353463bb21c52adece12965" into sc-v2-dev-plus-aosp am: 1a4bf269 am: 6defa5fd

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

Change-Id: I893eb355990568a5d0643ca36d240258d7970f48