[automerger skipped] Camera2Tests minsdk bump from 19 to 21 am: b8bc18231a -s ours am: 7c4e4ce07d -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: I7c40108769e507359f84341bafdfc7141b48758b
Signed-off-by: Automerger Merge Worker <[email protected]>