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

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

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