[automerger skipped] Merge "Pass the correct user id" am: 1d01d760 am:...

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

am skip reason: Change-Id I21b0fa98143f4f1699fe42a37814b3470cea7c1e with SHA-1 4421aee5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I734f71e49f2b5238c57493e0be6effc9f9ebc8f3