resolve merge conflicts of 715acea3 to sc-v2-dev-plus-aosp am: fdc44659

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

Change-Id: I83bbbc41c1b1e513d22572fe8b54dd8721fa9e18