[automerger skipped] Merge "Fix setAdministratorUids tests on Q" into rvc-dev am: 0a558d498b am: 8ee0d4c17e am: f4def6ef4b am: d9f161438d -s ours
am skip reason: Change-Id I1b362660de9733bb9f0ede1ed5cf62279bf1c05e with SHA-1 07a498b4b2 is in history
Change-Id: Ia3d22ae1f71922d7c320f837e8dcc5442d24bf4f
This commit is contained in: