Merge "Revert "Add qemu.hw.mainkeys to system property_contexts""