Merge "[SdkSetup]  Clean up" am: 6105088a62

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

Change-Id: I678e89361a731633e57042527155e33225aa3818