Merge "Move SdkSetup app into device/generic/goldfish" am: 16a8d0fa8e

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

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