Merge "Gatekeeper: Add missing user_id." am: 5edcb8a3d6

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586506

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5341695360aead592e61daed3f6733983eb08da