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

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