[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a696dcad2d -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: I4dd14c3e73a305d954caab25e29d8b3a8e7b33aa