Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev