Merge "Add adbd_prop, system_adbd_prop property types."