[automerger skipped] Merge "Add version check to prevent test fail on Android...
[automerger skipped] Merge "Add version check to prevent test fail on Android Q" into rvc-dev am: 3d02325f -s ours
am skip reason: Change-Id I73ef7eececec757a6e9683b231bf73fcd8d49f8d with SHA-1 822a3c80 is in history
Change-Id: I44e001c8f140d121ede32bc581792cb8de66b54c