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 am: ff87c94b -s ours

am skip reason: Change-Id I815d574f791734d4c6a25a9f8d827b5b4f93d7cc with SHA-1 4975a933 is in history

Change-Id: Id554c2ac3f4276e511d82b370c7d9af7ba167d8a