Merge "[automerger skipped] Merge "Skip a RGG test with SIN followed by FLOOR." into android10-tests-dev am: e2054d5865 -s ours" into android11-tests-dev