[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 -s ours am: f546e431 -s ours am: b3ea13c4 -s ours am: b08dab50 -s ours

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

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

Change-Id: Ie7ba7644b2d8f5ce77acccfd0c76dbc9f3522886