am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev

* commit 'c3aa7f3a7564f36db58d8a9a5470fd64f6fa282b':
  Camera2: Handle surface size change