tree f9004b8cb4e80efca183507e66aa808d39ba3283
parent 9bf578c4647be33b22c7cddcf72ac6e8c48f7454
parent 9cf07c95a1ae0aed224b3b265faf6a3f7bb5e82e
author Fabian Kozynski <kozynski@google.com> 1589896900 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589896900 +0000

Merge "Deflake test in AppOpsControllerTest" into rvc-dev am: 5c82912ab7 am: 8dbbb793db am: 9cf07c95a1

Change-Id: I27f9f0076c6c08c1019ed03c6951771285926212