[automerger skipped] Merge "Add minSDKVersion to tests for Q devices" into...
[automerger skipped] Merge "Add minSDKVersion to tests for Q devices" into rvc-dev am: 96f1b367 am: 594f491b am: f5293f7c am: 32e09e47 -s ours
am skip reason: Change-Id I1b25e23ec1253bbac159a64d88702a4b4b8aaa37 with SHA-1 85919c5a is in history
Change-Id: I9335d6bf2003edab6051d57ea4ddbcebe9ee51d2