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

Change-Id: I4b46b19b5484f596d8224178aa22f65c1e6507cf