am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad

* commit 'ccfafd95cd4fa046df9d43469d28152f8a04bfed':
  Add Samsung front camera resolutions