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

Change-Id: I7dc8e7da2d02d0b3e5f98bad8a4e841e4a2c796d