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