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

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

Change-Id: I64010d78e99b87c6511a3d7052042cbbcc047b2a