[automerger skipped] Merge "first-stage mount: support using other avb_keys" into qt-dev
am: 84ababefb7 -s ours
am skip reason: change_id I0c81f816efb0dd40c93da2df304f2e215df9d105 with SHA1 a0f8b05d91 is in history

Change-Id: I5aa52cd8f9c8519b542c7db75aaf1a42a286fd11