Merge "Track priv_app firstboot_prop denial"