Merge "DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into marshmallow-cts-dev am: 4a889caa51  -s ours
am: a07888db26

* commit 'a07888db26132137ff2623977972805870c5379d':
  DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition