Merge commit 'c7396025e59524e7ef639fd86fc23123939ee91c' * commit 'c7396025e59524e7ef639fd86fc23123939ee91c': Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
Merge commit 'c7396025e59524e7ef639fd86fc23123939ee91c' * commit 'c7396025e59524e7ef639fd86fc23123939ee91c': Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)