[automerger skipped] Merge "Add product and system_ext partition for emulator"...

[automerger skipped] Merge "Add product and system_ext partition for emulator" am: 1c859937 -s ours am: ed5c7452 -s ours am: 33cdb0c2 -s ours am: 6cd47f12 -s ours
am: 54ab625c -s ours
am skip reason: change_id Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2 with SHA1 ff3d62d3 is in history

Change-Id: Idc17753cbca11554dea71eb3caa7a50e3cdc8416