Merge "Fix selinux denials for usbd" am: 23e60de4ff am: 461316dd0e
am: 5020a73743

Change-Id: I2ee28b9ce16f66614d0a27859627e2464d1cdbed