Merge "Merge "Adding new peripherals to the ProfileManager" into oreo-cts-dev am: 13e4d7ddc9" into oreo-mr1-cts-dev