Merge "[automerger skipped] Merge "Allow more than one '=' in...
Merge "[automerger skipped] Merge "Allow more than one '=' in avb_extra_custom_image_extra_args." into rvc-dev am: 4217f575 am: d0e1a1b8 -s ours am: c5135f6f -s ours" into rvc-qpr-dev-plus-aosp