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

Change-Id: I3a7e1914362540f452c16636e623ccf92691106c