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

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

Change-Id: Ibfb4575823e2fcd3843e5e3a4d7350d3a0ec87c1