Merge changes I231bdda9,I529134df,Ia5986452 am: fde58acea3 am: 85e3e1689a am: 6d53b46e24 am: 5251ae8f5e am: c26459cf64

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

Change-Id: Ie753a3aef883ef0b9f4dd8d43084c0550d5cb7d7