[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a696dcad2d -s ours am: 576935fc6c -s ours am: 8d0898b780 -s ours

am skip reason: Merged-In I859cb4a02bf278dec9a31cac1efb2ce5cb05fa20 with SHA-1 803264e51c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/base/+/15568746

Change-Id: Ib55a60bd32c899c036e2aab5cbc5fe834ecbe5bf