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

Change-Id: Ie1c43eb87e5b3531cdbd7c7eb95d5292d522e64f