Merge changes from topic "presubmit-am-38a835692f314290aa45b4deba2bb3ab" into...

Merge changes from topic "presubmit-am-38a835692f314290aa45b4deba2bb3ab" into sc-dev-plus-aosp am: ae3f83ed am: eebd33bc am: 65b0781e

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

Change-Id: Id90dad5a1396e0959215e455d4802a45bb0dce12