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