Android 7.1.0 release 7
Prevent camera app crashes on changing hw.camera.* settings
am: 996546fcf4

* commit '996546fcf4058d98d9aceecb4086283e17ae6c9d':
  Prevent camera app crashes on changing hw.camera.* settings

Change-Id: I372bf5a00f021c89abda49966bc12eaca97a80c5