[automerger skipped] Merge "Pass the correct user id" am: 1d01d760 am: 132f054e am: b0538566 -s ours am: 709db6c0 -s ours am: a7af3158 -s ours

am skip reason: Merged-In I21b0fa98143f4f1699fe42a37814b3470cea7c1e with SHA-1 4421aee5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549721

Change-Id: I63fe9d5d96474159e0eaa9b6cb9e44c0c3e9d1c7