[automerger skipped] Merge "Add minSDKVersion to tests for Q devices" into rvc-dev am: 96f1b367 am: 594f491b am: 85b72693 am: 7199813b -s ours am: 440d6eb4 -s ours

am skip reason: Change-Id I1b25e23ec1253bbac159a64d88702a4b4b8aaa37 with SHA-1 841c79a8 is in history

Change-Id: Ib146ae0d395e2473f850c7afba220f528acb666a