[automerger skipped] Merge "Pass the correct user id" am: 1d01d76048 am: 132f054eb2 am: b0538566e7 -s ours
am skip reason: Change-Id I21b0fa98143f4f1699fe42a37814b3470cea7c1e with SHA-1 4421aee5e0 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie99e20ac0e01444cfdcd883ae88ae4bea77db5e0
This commit is contained in: