[automerger skipped] Merge "Camera: Narrow down cases preview spacer is used"...

[automerger skipped] Merge "Camera: Narrow down cases preview spacer is used" into tm-dev am: f6523efd -s ours am: b8b86bfc -s ours

am skip reason: Merged-In I40a3b1acac44ed8a474aad94b77aee8f7399eb31 with SHA-1 fe8a2a32 is already in history

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



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