Merge "Use correct user id for permission check for instant foreground service" am: b76e984536
am: 2ba5aba394

Change-Id: I45396cd0b375cae8c97e9d8f7da6a4c38e703e48