Merge "resolve merge conflicts of 20283435 to...

Merge "resolve merge conflicts of 20283435 to sc-dev" into sc-dev am: 8e8ff048

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

Change-Id: I885d040e4925ca89672c1800bd8efc3398e81f83