Merge "Assert that rollback is enabled for priv shim apk inside shim apex"