[automerger skipped] Merge "Import platform SDK from build 7488740" am: f48efb37e3 am: 08fb794533 -s ours am: f14ee1bd61 -s ours am: 1e46048d77 -s ours

am skip reason: Merged-In Ia375dbc509e66d097a24e02e0ce86f83c16dad37 with SHA-1 2385320a4e is already in history

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

Change-Id: Id2f84425aa571ad9229226a5797b6970ad5b4668