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

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