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

Merge "[automerger skipped] Merge "Camera: Narrow down cases preview spacer is used" into tm-dev am: f6523efd am: 82f2c1e3 -s ours" into tm-d1-dev-plus-aosp am: bdfb0c0e -s ours am: 724d1328 -s ours

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

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



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