Merge changes from topic "presubmit-am-eb1892e785d84ba080947a5e15b95c90" into...

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

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

Change-Id: I37a01550cada988ed7d7b416da6601f365414d76