[automerger skipped] Merge "Camera2Tests minsdk bump from 19 to 21" into main am: fb43689a74 -s ours

am skip reason: Merged-In I5c0fb04121f17f5ad4ebb0e5129cb10ab2710608 with SHA-1 349c16128b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/3146163

Change-Id: I413aea21a6682b3bfb80ad8b043db6702c398cbe
Signed-off-by: Automerger Merge Worker <[email protected]>