Snap for 6787936 from 98b7d4f87d08958eee0831b4c37eab5f23d43771 to rvc-platform-release am: 71c2fc9db5 Original change: https://googleplex-android-review.googlesource.com/c/platform/test/framework/+/12655432 Change-Id: I5435fb0ab4493ef685cf81a3179cea1514a869ab