Merge "Merge "Use unique URI for different rules" into android10-tests-dev am: e58ad2c6a6" into android11-tests-dev