Merge remote-tracking branch 'goog/rvc-dev' into HEAD am: 527d66b869 am: 33378d9c14 am: c64222fe9a

Original change: https://googleplex-android-review.googlesource.com/c/platform/compatibility/cdd/+/12504564

Change-Id: I600f823012f76a353936413384cb452509782829