Merge "Merge "Cherry-pick FP related test changes from main branch." into android12-tests-dev am: e7c17e1f3f" into android12L-tests-dev