Merge changes from topic "presubmit-am-ff080f640353463bb21c52adece12965" into...

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

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

Change-Id: I4f736eac51a007dd90126b470f19af2c9e8e6c57