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

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

Change-Id: I101f9010ed31919b998f7ceb53065d7ff9243085