Merge "Restore activity lifecycle when OneCameraManager fails to initialize" into...

diff --cc src/com/android/camera/CaptureModule.java
index 1149986,21da7e9..6b992da
--- 1/src/com/android/camera/CaptureModule.java
--- 2/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@@ -1415,4 -1440,4 +1423,4 @@@ public class CaptureModule extends Came
              return Flash.AUTO;
          }
      }
--}
++}