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