Merge "Add version check to prevent test fail on Android Q" am: 4b0fc3fdfa am: e4545dc59a

Change-Id: I1985c4cfe6ff1712f2d181a151bfee0160fc96bf