[automerger skipped] Merge "Add version check to prevent test fail on Android Q" into rvc-dev am: f425a3103a -s ours
am skip reason: Change-Id I73ef7eececec757a6e9683b231bf73fcd8d49f8d with SHA-1 f5ef6765d5 is in history
Change-Id: I44e001c8f140d121ede32bc581792cb8de66b54c
This commit is contained in: