Merge "Retire device/generic/qemu am: 12b48753e5 am: b6065a1e58" into rvc-d1-dev-plus-aosp
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.