am 900e04c1: am 50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev

* commit '900e04c1a2e0529a9a99be12222efccd5f74e306':
  camera2: Don't NPE in onStatusChanged