[automerger skipped] Merge "Import platform SDK from build 7304504" am: bfecfbf10a am: dea7b8e2e9 am: 0bfafa473b -s ours am: db027b1b79 -s ours

am skip reason: skip tag Change-Id I481e69af84273d1573e6bbeb5a675b16ec90bb8d with SHA-1 5dac9f0fc7 is already in history

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

Change-Id: Icad87ee2d1c52bcd9890b72a4357f184303c0310