This reverts commit 3bf31401fe.
Reason for revert: Build cop revert because this change is breaking Blueline builds.
Change-Id: I54f87f21eec0e93873ffedec6b0bbe154584ba4b
Otherwise, it causes the CTS-on-GSI failure on non-emulator devices:
CtsPermission2TestCases android.permission2.cts.PrivappPermissionsTest#testPrivappPermissionsEnforcement
Because non-emulator devices lack the permission file in their /vendor.
/system/priv-app/SdkSetup/SdkSetup.apk
/vendor/etc/permissions/privapp-permissions-goldfish.xml
Bug: 110517983
Test: boot a GSI and checks that SdkSetup.apk is moved to /vendor
Change-Id: I3086f99c477eeca38f42041e1809a5aa3b8bfa7a
