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

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

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

Change-Id: I8d3ea9d492a7bebf72ee8675823728f1ba95981c