Merge "Add version check to prevent test fail on Android Q" am: 4b0fc3fd am: e4545dc5 am: cd165757 Change-Id: I11fea0bb6c92c617592c9341bf8eb98694a6aba9