Merge "Disable test until APK prebuilts udpated" into rvc-dev-plus-aosp