Merge "Import platform SDK from build 7304504" am: bfecfbf10a am: dea7b8e2e9

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1684990

Change-Id: I563c1aba6af064e251b6309161910138c247c4af