am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev

* commit 'd23f8b44d575dcdc00965aae5fffd97f0336df43':
  Revert "Camera: Add new capability flags as system features as well"