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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6462d9dcf0cfdbe7af7b91d18c5293e4c87f57c1