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

Change-Id: I127b3eb522a7bfe18ae8e8932858b99406c67ade