[automerger skipped] Merge Android 12 am: f8e47a07be -s ours am: b12ffeee7f -s ours am: 156a09762e -s ours am: 9b8b20c880 -s ours

am skip reason: Merged-In I965e46e02e7c0f58a7d93244526a8b54f63a1913 with SHA-1 d50b4c7322 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/adt-infra/+/1847420

Change-Id: Ie7bc262fbbb9045d90bfe34e4c2093ecefb3571f