Merge "Remove redundant action triggers on persist.sys.usb.config" into nyc-mr1-dev am: 031afc0dba
am: 2afe36ec6b

Change-Id: I92954e2340f326a2f412851445926a690ffef802