Merge "Merge "Merge "Merge "Adding super-set of index channel masks to USB Peripheral Profiles." into oreo-cts-dev am: 3a326558b9" into oreo-mr1-cts-dev am: 97681c2df6" into pie-cts-dev am: 8086014350"
am: a331db21e4

Change-Id: I3ac7794924105aabb069f5c9daa4d5e9e2fba349