Merge "Allow only public-readable to ro.secure and ro.adb.secure"