Fix user handling for actor enforcement

The OverlayInfo query doesn't handle CURRENT_USER. Moved the
user enforcement and re-assignment above so it's converted to a
real ID before the enforcer runs.

Bug: 145264427

Test: manual enable alternative navigation per bug

Change-Id: Ic7b71ea021f3c326b17bc8d346b087f3eee5b93b