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

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