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

Change-Id: Ib243936c63dcc9443255ee6c8e09aff72bc1a4db