Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev
am: 98990c5fe4

* commit '98990c5fe4ab80593da3721566dd10c45df49800':
  Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition