am 6577c082: am 65b109a2: am bace0107: Work on issue #2259506: camera ANRed and then device runtime restarted

Merge commit '6577c0824332165fc49941f813cfefad4fe10a51'

* commit '6577c0824332165fc49941f813cfefad4fe10a51':
  Work on issue #2259506: camera ANRed and then device runtime restarted