Merge "Add caption bar consideration to SnapshotTaskTests." into android13-tests-dev am: afd8815ce6

Original change: https://android-review.googlesource.com/c/platform/cts/+/2506639

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