am 6a005419: Merge "camera2: BlockingStateListener invokes proxy before firing state change"

* commit '6a005419e50275062d97711ce8402b5d71940c81':
  camera2: BlockingStateListener invokes proxy before firing state change