Merge "DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into marshmallow-cts-dev