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

Change-Id: I40d29c56f649b56908c602bbd611ed1c5d4b7f76