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

Change-Id: I0d21ea5841c93271e9cfc1c04cf33bbc908cfaf6