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: 2d7bc584 am: be9e53d1

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

Change-Id: Ib540c41a136966eac8cb9dd597e4d85896f19187