resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev am: 60f3ab275e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1ac5da1bbaa987ae2debb868c41b2999f45e973