am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev

* commit 'ba164dfbcab8d1358075e18199b3ef55f85c8b88':
  camera2: Fix race conditions and deadlocks around configuration