Merge "Use correct user id for permission check for instant foreground service" into oc-mr1-dev
am: 0640facdc3

Change-Id: I9b3ebd42c7c5fc59f5c1332ea14d28ff3c8f14ca