Merge "Calls check-and-set-avb-args() when the system.img exists" am:...

Merge "Calls check-and-set-avb-args() when the system.img exists" am: 99bec023 am: 7238491c am: a0e28118

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

Change-Id: I5bfe28ee0af83c4946eb8ad6ba05f5a770eeecb3