Merge "Merge "Update clean-up for MultiAuthorityTest." into android13-tests-dev am: b7bb7cfbea"