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

Change-Id: I144211017d01e61282e946f626df6053d53d0ef8