[SdkSetup]  Clean up am: c9c6c19f5d

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

Change-Id: Iadc5dcc14afdabc20b614e236280e6aa5ce65725