Merge "Use androidx Flaky annotation for device tests." into main