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

* commit '86d86c2e7c08a99b226820a1a5e53876d9171086':
  Camera2: Handle surface size change