Merge "resolve merge conflicts of c94e810c to...

Merge "resolve merge conflicts of c94e810c to rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: a3d8ee34

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

Change-Id: I3de451092d7139bc0b19d4288967e9347a69908e