am d9962b0c: am 6a005419: Merge "camera2: BlockingStateListener invokes proxy before firing state change" * commit 'd9962b0c':