[automerger skipped] Merge changes I385b17e0,Ia6cd02db,Ifa5f8959,Ie6cf2440,I5491a341, ... am: 234d052fc9 am: 51f39c9c20 am: 4a0e90f7da -s ours

am skip reason: Merged-In I385b17e087c749da69905e8d17762a285ed93e9b with SHA-1 e97b41f776 is already in history

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

Change-Id: I772b4e67a300618903c607358a26926e22eb7211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>