Merge "Make surface_flinger_native_boot_prop a system_restricted_prop for ADPF"