Merge "Update platform targets in //prebuilts/sdk to match //build/bazel/platforms" am: 7ccdb660e5 am: 483b2d092d am: d6850c6955

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

Change-Id: I3d5c540159e6fd59cf8e07676b2efbda912d5d86