Merge "Move SdkSetup app into device/generic/goldfish" am: 16a8d0fa8e am: d42dd28394 am: 895aa04c46 am: 1f5c2423f2 am: 8e70951fd6

Original change: https://android-review.googlesource.com/c/platform/development/+/2221506

Change-Id: Ibd7b09eb7859df45eebb6843627e7db6dcb473e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>