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

Change-Id: I8f4cfe209eac804022e3bde9d26984abc67f73dd