Merge "Add tests for RRO of APK-in-APEX." into rvc-dev am: 4914d4cd4c

Change-Id: Iebbe8020dc11d8e9db0cf25438a66575e1fb7363