Merge "Retire device/generic/qemu am: 12b48753e5 am: b6065a1e58" into rvc-d1-dev-plus-aosp am: 3d94f017c6 am: 7d9a9daec4

Change-Id: Id7445ad0e115a6b174f7120de32657b79d33ba8d
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.