Merge "Populate all other emulator properties as `ro.boot.qemu.*`" am: 6463f60a56 am: 07d6796b6f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1661935

Change-Id: I04684ff7ae4d36cb1f284ce8e1c0da0eefdcba2e