[automerger] Merge "Use CamcorderProfile to get workable resolution" into nougat-mr1-cts-dev am: 0a6d91ae42 am: a7ee400b54 am: e176f01d83

Change-Id: Id56897b2c34a8aedbef892abf59ee6e99ae88fe8