Merge "Revert "Camera: SessionConfiguration should use Executors"" into pi-dev
am: 6896508045

Change-Id: Ie5ddf63381a151b8a728998ca75d7e99f238d5a9