Ensure Current user is always included

* 0b878a59 added a change that ensured
  users were added in a predictable order, but introduced an issue where
  the current user was not getting added.

Bug: b/408084746
Test: manual & presubmits
Flag: EXEMPT bug_fix
Change-Id: I6316bf63adada4c4a8e5e327c26c923e7efcd3a4