[automerger skipped] Merge changes from topic "presubmit-am-603d217d511347a6a08cdbbc0ae5a67c" into sc-dev-plus-aosp am: 6185f37a -s ours

am skip reason: Merged-In I3b7166d28df6d8828f895f839186de78592d259e with SHA-1 644348a6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: I99799b12c8ec67b3bea9b62de70a411f2f60dfc6