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

Change-Id: Ia1c2dbf7ba47ce4dc71b3669d11d101a07f75477