Merge "Camera: Fix deadlock in ACameraCaptureSession destructor" am: 66ce689527 am: 7dd0928bd1 am: 81429402d8

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1535309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I858710a373350c81534eaf8a3f462193f5e191c3