Merge "[automerger skipped] Merge "Add version check to prevent test fail on Android Q" into rvc-dev am: 3d02325f am: 241b2c6c -s ours" into rvc-d1-dev-plus-aosp am: 5639e984 -s ours

am skip reason: Change-Id I73ef7eececec757a6e9683b231bf73fcd8d49f8d with SHA-1 822a3c80 is in history

Change-Id: I2eec9282b5e226123b58624daf8d386476f7acde