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

* commit '41093f860c88767dde469af87f141999c4b660f5':
  Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition