Pass the correct user id

Pass the current user id so the secondary user won't fail to query
due to lack of INTERACT_ACROSS_USERS.

We will add a test to ensure all users see the same set of modules.

(Cherry-picked from 4421aee5)

Bug: 176152485
Test: N/A, will add a cts
Merged-In: I21b0fa98143f4f1699fe42a37814b3470cea7c1e
Change-Id: I21b0fa98143f4f1699fe42a37814b3470cea7c1e