Merge "DO NOT MERGE. Updates used permissions for fine location CTS." into android12-tests-dev