Merge changes from topic "presubmit-am-eb1892e785d84ba080947a5e15b95c90" into sc-dev-plus-aosp am: 3e204326

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

Change-Id: I0b45033195509dcf4beae84435084d5c166dabbb