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

Change-Id: Ia1996a0d215cacf5fb60ca51058e7f7c2d157627