Merge "Merge "Use CameraId to check/get CamcorderProfile" into nougat-mr1-cts-dev am: c39a31a125" am: 3f2d4cf627 am: bc45e56f26
am: 226e149feb

Change-Id: Id66d5c8ad423abfd03e9930bb0a150fcb1f4721b