Merge "Import platform SDK from build 7971431" am: 1b685f10c2

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

Change-Id: Ic5f73aaff566ebe594efacd07a3f9e831ea09146