Merge "Skip bubbles tests for PC" into android11-tests-dev