Merge "Camera: Narrow down cases preview spacer is used" into tm-dev am: f6523efd8c

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

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