[automerger skipped] Merge changes from topic "rvc.nb.rs" into rvc-dev am: 4b2220c0c0 am: e42c744781 -s ours

am skip reason: Change-Id I3955d9b54aaea7a6b5b9bde81a336908a849cde6 with SHA-1 9a12a013ee is in history

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

Change-Id: Ia0b87486426cd754b32d62a33f6008307c7faa1c