Merge "Add new shim whose has apk-in-apex fails to install" into rvc-dev