Merge "Specify foreground service type and permissions for FGS under frameworks/base."