Merge "Add tests for RRO of APK-in-APEX." into rvc-dev