Merge changes I385b17e0,Ia6cd02db,Ifa5f8959,Ie6cf2440,I5491a341, ... am: 234d052fc9

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

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