[automerger skipped] Merge "Handle R-based extractor behavior on Q devices" into qt-qpr1-dev am: 414abad8f0 -s ours am: 42fe3dd161 -s ours

am skip reason: Change-Id I0ef3700ef5196fe5512c11b0284e00fa72b500c2 with SHA-1 f6b74a6896 is in history

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

Change-Id: I70a0d76c5f1520a8e04d2fcfc55c23dff38b1fa8