Merge changes from topic "from-pi-gsi" into pie-gsi

* changes:
  Revert "Move SdkSetup.apk to vendor partition"
  Move SdkSetup.apk to vendor partition