Merge "resolve merge conflicts of 8f21448a to...

Merge "resolve merge conflicts of 8f21448a to sc-v2-dev" into sc-v2-dev am: 647c5d86

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

Change-Id: I52deae50d6c3fdf4f197c597f3d4756b3c561523