Merge "Fix cannot find removeUnwantedCapability on R device" into sc-dev
tree: 58067bedb0e943e3711b72b3d07af0965234fc22
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING