Merge changes from topic "rvc.nb.rs" into rvc-dev am: 4b2220c0c0 am: a22cda2c32

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

Change-Id: I899c9e3216634ddde2e1cc14e32ac323f12e8b4a