am 9d918db3: Merge "UsbDeviceManager: Add back support for persistent property" into mnc-dev

* commit '9d918db350aa52a1c01c605ef94e1158f265fed0':
  UsbDeviceManager: Add back support for persistent property