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

Change-Id: I90fe9585e1d2bbb96584196c97b24104e9d52a18