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

Change-Id: I2b8dc9fa3fa1e48060c0f1204dddf89a8df4c26d