Merge "Merge "Camera: Avoid possible deadlock when closing advanced extension...

Merge "Merge "Camera: Avoid possible deadlock when closing advanced extension session" into sc-qpr1-dev am: 00c890cd am: 86d2205d" into sc-v2-dev-plus-aosp am: d22363ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15976219

Change-Id: I150b4e4d592540542d9f277fde1db9382a36b7a5