Merge "Merge "Camera: Exit PreviewStreamSpacer when disconnecting stream" into tm-dev am: c3a3ee8362 am: 2aa5943481" into tm-d1-dev-plus-aosp am: 4be0ac0860 am: 683fd83463

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

Change-Id: Ie5a6e81d7fb92b615a0134e2836c69c6516b5b72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>