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

am skip reason: Change-Id I3955d9b54aaea7a6b5b9bde81a336908a849cde6 with SHA-1 38786ab15a is in history

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

Change-Id: Ie8b7e95fc309eef667c3db63241b968a56fc6eb7