Merge "resolve merge conflicts of 6a6b9eff to...

Merge "resolve merge conflicts of 6a6b9eff to sc-dev-plus-aosp" into sc-dev-plus-aosp am: 33b6f6a1

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

Change-Id: I60bc5859b06c19088e129fa31b6142cf7c7f01ea