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

Change-Id: Ia62afee767f2554f462e5a450175cfbb7a807812