Merge "init.common.usb.rc: remove duplicate trigger" am: 1fbace497e am: 61b71dbfb8 am: 655d11c7c2
am: e51c12f740

Change-Id: I5f099f209fba32c34107f0080027513a0eded17f