[automerger skipped] Merge changes from topic "rvc.nb.rs" into rvc-dev am:...

[automerger skipped] Merge changes from topic "rvc.nb.rs" into rvc-dev am: 4b2220c0 am: a22cda2c -s ours am: e87d1ee5 -s ours am: b5f4fb0a -s ours

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

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

Change-Id: Id2f13fcd88cc284929cada9b9ab348668bce5194