Merge "Add adbd_prop, system_adbd_prop property types." am: b8c108e15f am: 76cd6f8ff8 am: dc07a9d2c0

Change-Id: Iaaf6ab98e748a20f79907e1515a203eba84526c0