Merge "Camera: Use session configuraion when recording tests" into pi-dev am: 26da9f18ed
am: c6360e5772

Change-Id: I7667526285406451cea841dba22d265163c95354